bugs 80% fixed
commit fix bugs
fix bugs agian
Merge remote-tracking branch 'origin/zhangjc' into release