refactor
refactor
fix crash
refactor
fix
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49