Closes #177