Fixed #47. Hangs are not due to scanner errors. Certain characters are not being checked at the appropriate spots in the parser.