Issue #96 fixed; pending verification
Issues #97, #98 and #99 fixed, pending verification
Issue #100 - fixing in progress, pending verification