merging master branch updates into my physics branch