Minor changes in some messages
Merge remote-tracking branch 'origin/master'