fix some stuff
Merge branch 'master' of github.com:s2x/ccframework