Merge pull request #44 from OkayX6/develop

New keywords & tokens supported