Merge branch '1.1'
allow adding a message