Merge pull request #261 from zelgerj/master

updated dependencies
major refactoring due to internal interface changes on server module concept