Feature/nro 20

pull request 20