Significant improvements to the parser. Bumped to v.0.3.2