bug fixed commit
Merge remote-tracking branch 'origin/master'
6 plus bugs fixed commit