issue #50 fixed