Merge pull request #9 from tharindu1st/master

Merge pull request #8 from tharindu1st/master
Merge pull request #16 from rmmpremaratne/master

Merge pull request #9 from tharindu1st/master