Merge branch 'marcosBranch'