This closes #169