Merge branch 'master' into development
[UPDATE] updated submodule
Merge branch 'development'