Make it Heroku compatible
Merge pull request #2 from nviennot/master

Make it Heroku compatible