Merge pull request #267 from nishedcob/master

Merge pull request #263 from nishedcob/nishedcob-nyx
Anadir Campo de Algoritmo a Configuracion de Llave (parte 1)
Anadir Campo de Algoritmo a Configuracion de Llave (parte 2)
Merge pull request #270 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #271 from nishedcob/master

actualizar rama andrea