Issue #113 fixed, pending verification
Issue #116 fixed, pending verification