repaired stuff
earlier commits were lost in space-time continuum, so we had to reimplement all modifications
Merge pull request #30 from victorbadila/25-Victor-Badila

25 victor badila