Resolve issue #7 as FIXED