Addressed Issue #48