diagrammer 1
Merge pull request #98 from TuristAppV5/jari

diagrammer 1
fix
Merge pull request #99 from TuristAppV5/jari

fix
Merge branch 'master' of https://github.com/TuristAppV5/TuristAppV5 into daniel