Merge pull request #13 from torifat/master

Added test coverage