Closes #614