Added Rodrigos work to master