Closes #234