added some network buffering
Merge branch 'dev' of github.com:collab-mode/collab-mode into dev