fixed Issue #8
fixed issue #9