Fixed page richness calculator
Merge remote-tracking branch 'upstream3/master'