little fixes
Merge remote-tracking branch 'start/master'