added functionality for pimms support
Merge branch 'master' of github.com:ravengraus/Stream-Server