Merge pull request #813 from hurtonm/master

Fix some comments regarding method overriding
Replace assert with zmq_assert