Merge pull request #7 from wwphp-fb/feature/modulemanager

Feature/modulemanager