Merge pull request #12 from lieutdan13/issue-9

Fixes Issue #9