Merge the develop branch into the master branch

Merge the develop branch into the master branch