Merge pull request #6 from rmmpremaratne/master

Merge pull request #3 from tharindu1st/master
Merge pull request #4 from tharindu1st/master

Merge pull request #6 from rmmpremaratne/master