Make heroku deploy friendly
Fix Merge
Merge branch 'ilyakava-heroku'