close issue #44 and #43