Merge pull request #19 from rmmpremaratne/master

Please pull
Merge pull request #12 from tharindu1st/master

Merge pull request #19 from rmmpremaratne/master