Closes #329.