修复：Issue #101 & #100