Merge pull request #1 from andreigc/for-heroku

For heroku
for heroku