Patch 21
Merge pull request #50 from Dilshani/master

Patch 21