Merge pull request #46 from PierreR/master

Cleanup Parser type