Fixes #24
Merge pull request #25 from samuel02/string-issue

Fixes part of #24