Resolve issue #15 as FIXED