fixed issue #10, #11
fixed issue #10, #11