Merge branch 'master' into development
Removed error print function
Merge branch 'development'