Merge branch 'master' into development
[UPDATE] added global module registry
Merge branch 'development'