messaging related changes
Merge pull request #29 from feri/overhaul

messaging related changes