Some bug solved in creating modules ...
Merge branch 'develop'