Merge pull request #46 from pstadler/master

Improvement regarding unparsable strings