Issues #130 and #131 fixed, pending verification