Dev

Merging of the master branch into the dev branch