Merge pull request #854 from ravigehlot/4.1

edits to upgrading from 4.0 to 4.1