Fix issue #3 and #4