Incorporated  my latest changes with master branch.