Closes #175