Fixed the callback functions and other small mistakes in Message
Removed the not used parameter
Merge remote-tracking branch 'origin/master'