Merging branches, updating master

Some cleaning of the repo to update the master branch.