Merge pull request #2 from tharindu1st/master