Updated grammar, tokens, parser as of issue #2
Merge branch 'martyn82'