Develop

Merging the develop branch into the master branch using github's pull request feature.