Add new parser
Fix new parser
Merge pull request #1 from microtroll/v0.2.1

V0.2.1
Merge pull request #2 from microtroll/master

v0.2.1