This closes #172