Merge pull request #1 from Ascendzor/master

PubSubbed Server
added new features without changing existing code