Issue #267 completed.