This closes #170