Closes #464