change style of message
Merge remote-tracking branch 'origin/master' into dev