issue #14 and #20 fixed