-Simplify field/type parser
Merge branch 'master' of github.com:phile314/mcco-projects