Heroku support
Added default ordering
Fixes