Merge pull request #45 from cdman/simple_unformatter

Improved error handling for parsing errors
Merge branch 'simple_unformatter'
Style improvements as requested
Merge branch 'parsing_improvements'