Merge pull request #15 from dinithiviranga/master

Merge pull request #20 from rajeenthini/master