Merge pull request #13 from cbeams/zmq