Merge pull request #8 from cbos-team/master

position detection of modules and layout improvement
Merge pull request #45 from KevinHuebner/master

Merge pull request #8 from cbos-team/master