Merge branch 'master' into development
updated text
Merge branch 'development'