Proper token checking (thanks coffeescript), refactor, required token tests
release 2.2.0