Modified grammar and test
Merge branch 'master' of github.com:ArjanO/AP-NLP