Resolve issue #8 as FIXED