Merge pull request #206 from davispuh/parser_improvements

Parser improvements (continuation)