Fixed regex bug in broker
#13 #18 added response messages to system actions
Resolved merge conflict