Added Message Handlers Solution Resolves #1