Refactor build message method a bit
Merge remote-tracking branch 'origin/master'