Commit #1 Gilberto

Please, merge this branch to ts01.