updated for messages
Merge branch 'master' of github.com:Milstein/Mill