Closes #235.