updated pull request

[shefben]

Your Latest commit is integrated in my repo, if you have questions about any changes (like socket variable name changes) just ask

edit: fixed connectioncount variable causing directoryserver to crash