some bugs fixed
Merge origin/master