Developing

Merging the Developing branch into Master.