Fix PubNub Issues
Merge pull request #90 from armandopmj/master

Fix PubNub Issues