Close GH-479: Oops, open PR again. Fixes #454
Add @davidmaxwaterman to the list of contributors.