Issues #43 and #47 fixed.