Merge pull request #12 from lieutdan13/issue-9

Fixes Issue #9
Merge pull request #5 from clabot/master

Merge pull request #12 from lieutdan13/issue-9