allow adding a message
Merge branch '1.1'