This closes #177