Merging changes made in master to branch

Merging the changes made in master to branch as appropriate, so a pull request to source from forking can be made.