Resolve issue #9 & issue #10