Merge pull request #19 from TuristAppV4/daniel

Daniel
Merge pull request #20 from TuristAppV4/daniel

aa
Merge pull request #21 from TuristAppV4/daniel

aa
aa