now buffers are cached, not only points
Merge branch 'master' into gh-pages