Finalization (merge my-branch with master)