Resolve issue #13 as FIXED
Resolve issue #13 as FIXED