Switched back to buffered framing
Pretty decent performance
Merge branch 'master' into oldstate