Heroku friendly - 0.0.16