v.0.2.1 - Some changes for heroku database