Parse integration
Merge pull request #8 from paf31/master

merge parse changes