fixed things

things
Merge branch 'version2'
Merge branch 'master' of https://github.com/donaldkwong/caf8teen