Merge branch 'vitor'