More string normalization. Should fix #121
Merge pull request #122 from marcusmoller/master

More string normalization. Should fix #121