This closes #171