Merge pull request #83 from TuristAppV5/benjamin

Benjamin
lala
Merge pull request #84 from TuristAppV5/daniel

lala