fixed some code
Merge origin/master