be heroku friendly
Merge pull request #28 from pietia/be-heroku-friendly

be heroku friendly