tiny improvement
Merge remote-tracking branch 'upstream/master'

merge from dazer
Merge remote branch 'indz/master'