Resolve issue #19 as FIXED