Made some changes to help maintain connectivity
Merge branch 'master' of https://github.com/naomihimley/PubChatter