Merge branch 'master' into dev
added error message
Merge branch 'dev'