Merge pull request #1 from cfloresm/master

Merge pull request #16 from cflores/master
ABNK-X: commentario cambio Francois
Merge pull request #17 from francoisgergaud/cambiosFrancois

ABNK-X: commentario cambio Francois
Merge pull request #18 from cflores/master

Merge pull request #1 from cfloresm/master
cambio-01: modificacion con conflicto
Merge pull request #19 from francoisgergaud/cambiosFrancois2

cambio-01: modificacion con conflicto
ABNK-265  cambios desde fork carlos .
Merge pull request #20 from cflores/new-feature2

ABNK-265  cambios desde fork carlos .