fixed Issue #8 commented bug
fixed Issue #8 commented bug
enhance Issue #9