Closes #473