Merge branch 'release/2.1'
Readme file update
Flash messages and Readme file update