Merge pull request #1 from dinithiviranga/master

Merge pull request #1 from rajeenthini/master
Merge pull request #2 from rajeenthini/master

Merge pull request #1 from dinithiviranga/master