fixed issue #13 and issue #54