Fixes #8
Merge pull request #9 from kodify/issue_8

Fixes #8