fixed issue #5 and #6 minor bugs