Addressed Issue #12