branch merge
updated Makefile
Added noWait slot to 0MQ handler
Fixed missing boolean