refactor for heroku \,,/
Merge pull request #1 from lorn/master

Refactor for Heroku