Merge pull request #7 from tharindu1st/master

Tharindu's edits