Closes #234.