Closes #172