Merge pull request #3 from tharindu1st/master

All tests done
Merge pull request #28 from rmmpremaratne/master

Merge pull request #3 from tharindu1st/master