Issue #57 fixed, pending verification