cleanup and generation
Merge branch 'master' of https://github.com/tobsan/parparse