Msghandler

Master merged. Just need to push into the master branch