fix bugs
fix bugs
Merge https://github.com/blueantelope/JingTai