Merge pull request #45 from cdman/simple_unformatter

Improved error handling for parsing errors