benjamin branch
Merge pull request #7 from TuristAppV4/daniel

benjamin branch