Heroku support
Merge pull request #13 from Sachaniman/master

Heroku support