minor bugs
Merge origin/master
code reform
Merge origin/master