nro 20
merge 20
Merge pull request #7 from cruzjn/feature/nro_20

Feature/nro 20