closes #344
Merge branch 'messages' into develop
closes #286