Fixed issue #5 and #10