Resolve issue #16 as FIXED