fixed some little mistakes done before at the force update again
Merge remote-tracking branch 'origin/master'