#29 renamed forwarding into messages'
Merge branch '29-renaming'