fixed bug in parser, thou it's still really ugly
Merge branch 'master' of https://github.com/sssf/Abacus