Issue #69 fixed, pending verification