Fixes #13, messages now grouped together