Add messages
Merge branch 'master' of https://github.com/anhoavu/temp