This closes #174