This closes #157