Change
Merge branch 'master' of https://github.com/jcgr/GrammaticalFramework
A few changes + tests