This closes #161