evancz Merge pull request #2 from ahstro/grammar …