Closes #391.