+ added message handling
Merge branch 'master' of github.com:jug-eared/shiny-octo-hipster