fix _flush method
Merge branch 'master' into fork
fork 0.1.2