Changed namespace usage
Merge branch 'develop' of github.com:innomatic/innomatic into develop