SOme master chamges
Merge branch 'ricardo'