add features and fix some bugs
Merge branch 'master' of github.com:wjf3121/ShareTheTraining