fixed syntax errors
Merge branch 'token'