Merge pull request #136 from nishedcob/master

Merge pull request #132 from nishedcob/nishedcob-nyx
Anadir Codigo (GUI para Configuracion de Entrada Avanzada [AEC])
Merge remote-tracking branch 'origin/nishedcob-nyx' into nishedcob-nyx
Anadir Codigo (GUI para Configuracion de Entrada Avanzada [AEC])
Merge pull request #137 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #138 from nishedcob/master

actualizar andrea