Update v1.2
Merge branch 'master' of https://github.com/ShootingKing-AM/csx