fix issue #4 and #7

rt