proper groups in messages
Merge pull request #7 from tomvantilburg/master

toms work
Merge pull request #7 from stvno/master

merge from steven