Closes #470