Heroku friendly - 0.0.15