changes made in branch1

please review and merge to master