fixed #2: feature2
fixes #2.1: first bugfix
jp commit
jp commit
Merge remote-tracking branch 'jperez/jp' into feature2
Merge pull request #3 from jgabrielygalan/feature2

Feature2 from Jesus GyG, Jesus P. y Christoph