Merge pull request #1257 from thess/zmq-work