fixed issue #3 and #5