Merge pull request #64 from tabdulradi/master

Enhances Pubsub with Buffer and Bug fixes