Updated Developmental Branch

Updated the developmental branch so that it matches with the master branch.