This closes #137