introduced fallback for 'rank'
Merge remote-tracking branch 'origin/master'