Issue #80 fixed, pending verification
Issue #81 fixed, pending verification
Issue #77 fixed, pending verification