Merge pull request #14 from dinithiviranga/master

Merge pull request #19 from rajeenthini/master
Merge pull request #20 from rajeenthini/master

Merge pull request #14 from dinithiviranga/master