Resolve issue #10 as FIXED
Resolve issue #11 as FIXED