Issue #64, #62 and #57