Luis

Hello, i´m setting up the new code form branch1 to master