changed so it tokenizes every character
Merge branch 'master' of github.com:wailunho/project1