Refactoring -> rename Done to Cancel, add MergeBuffer, optimize merge
Update documentation, refactoring, etc...
Add tests
Merge branch 'master' into milestone
Add tests
Bump version
Fix test