Closes #695

#695