Manual merge of branch "issue-225"

I renamed one of the affected files in this branch, so I am manually
adding Jeff’s changes, which resolve #225.