Reinstate overwritten changes made in PR #58 (& keep pace with other changes to master)