Merge pull request #7 from tharindu1st/master

Tharindu's edits
Merge pull request #12 from rmmpremaratne/master

Merge pull request #7 from tharindu1st/master