This closes #158