Closes #78

... although the job will only be done when #51 is fixed.