This closes #163