Merge pull request #88 from isururanawaka/master