String index fixes
Merge pull request #5 from moeffju/string-fixes

String index fixes