Updated to work with CZMQ/2.x