modify estimate count blind to users
Merge branch 'heroku'