Sign Up - Marcos and Wagner changes...
merge