Merge pull request #8 from tharindu1st/master