Merging develop to master in order to test everything in Heroku