Merge pull request #37 from sphaero/master

Some minor fixes
Merge remote-tracking branch 'zeromq-dev/master'