Fixed issue #4 and #6