tidied up parser, and remove mad characters from text
Merge pull request #2 from djq/parse_improvment

tidied up parser, and remove mad characters from text