merging heroku and master branches - fixes