Changes addressing #6 and #7 along with others.
Merge branch 'master' of https://github.com/lmcmenemie/ForcedGrammar