Fix parser
remove mochi dependency
Merge commit 'd7501d5'