updated parser.* and scanner test
Merge branch 'master' of https://github.com/JamesGlanville/GF2