new message handling
Merge pull request #1 from mortzu/master

new message handling