Addressed Issue #35