fix
Merge branch 'feature-buffer' into feature-cli