Resolve issue #12 as FIXED