fixed issue #7 and #8