Resolve partially issue #10