Latest Changes

Latest Changes on master branch.