Resolve issue #17 as FIXED