Modified computations of rankings to have only one ranking by year
Merge branch 'issue-2'