Some more parser refactoring
Just a utility method for field search
Merge branch 'master' of github.com:CIIR/Proteus
Merge branch 'master' of github.com:CIIR/Proteus