fixed Renes part more or less
Merge branch 'master' of https://github.com/Mporsi/MEAP1