Fixes #63
Merge pull request #64 from kodify/issue_63

Fixes #63