Fix strings issues
Merge pull request #48 from scottwillmoore/fix-strings

Fix strings issues