Merge pull request #81 from eugenefilimonov/heroku_flip

Heroku flip
Merge branch 'master' into heroku_flip