fix bug at some extent
Merge branch 'master' of https://github.com/sysande/MyCC98