Copy update to Issue #23.