fixed minor things
Merge origin/master