change id to rank
Merge pull request #204 from vincent178/master

READY: change id to rank