Merged

Merged chatter in to master.