Merge pull request #26 from victorbadila/25-Victor-Badila

resolve issue
Merge pull request #27 from victorbadila/25-Victor-Badila

resolve language issues
repaired stuff
earlier commits were lost in space-time continuum, so we had to reimplement all modifications