Merge pull request #97 from TuristAppV5/daniel

Daniel