Fixed Issue #9
Fixed issue #8