Update master branch to reflect new commits to original