Merge branch 'master' into development
updates
updated update command
Merge branch 'development'