Improve parsing
Merge pull request #1 from jon301/master

Improve parsing