Merge pull request #4 from ehsalazar/ernie

Merge branch into master
Added in heroku workaround