Merge pull request #15 from gayanW/patch-1