addressed Issue #8