Bring my Branch up to date

This should merge the changes from the new Devlop branch to my development/docs branch