some code cleanup, improved parser
Merge branch 'master' of github.com:fding/math-tools