Master GIT merge

Merge with the master branch