Closes #218