Real display of hot bills
Merge branch 'master' into production