Closes #692

#692