Message module update
Merge pull request #986 from sexnothing/develop

Message module update
Code cleaning