Addressed Issue #14