Merged code

Merged messages and my push to master