Almost working complete parser
Merge branch 'master' of github.com:ardje/misc