Closes #610