Merge pull request #13 from dinithiviranga/master

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

Merge pull request #13 from dinithiviranga/master