Closes #600