closes #227

Relies on branch drobinson-226