buffer cb
Merge branch 'master' of https://github.com/drasich/cypher into HEAD