Closes #217