Develop

Merge all recent changes in Develop to the master branch.