Towards a solution for issue #72; these files should have been part of this morning's commit