Merge pull request #57 from zelgerj/master

refactored module and connectionhandler initialisation