Resolves #172