little fixes on the hillside
Merge remote-tracking branch 'origin/master'