Issue #125 fixed, pending verification
Issue #126 fixed, pending verification