Closes #417