Corection diamond
Merge origin/master