Latest Changes

Latest Changes on develop branch.