fix bugs
Merge branch 'master' of https://github.com/zzzace2000/T12_aabbcc