Merge pull request #239 from nishedcob/master

Merge pull request #235 from nishedcob/nishedcob-nyx
Trabajo con Jose Luis ( @joseDG ) y Claudio ( @cvgonzalez1 )
Merge pull request #240 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #241 from nishedcob/master

actualizar rama andrea