Merge updates made today on master branch