Client now receives messages and is thus useful
Merge branch 'master' into client-receive-messages
Removed extraneous import
Merge branch 'client-receive-messages'