Pull from rzmq master
Merge pull request #85 from rgbkrk/r_fix

Pull from rzmq master