Merge pull request #208 from just3ws/master

WIP#374 Handle unsubscribes