added skeleton for messagehandler
Merge branch 'master' into 3-implement-messagehandler
implemented messagehandler
Minor bugfix for messagehandler