Issue #107 fixed, pending verification