Merge pull request #328 from genu/development

Development
Fix servertype