Merge pull request #1 from WiechersV/alex_branch

Alex branch
Merge pull request #2 from WiechersV/alex_branch

Alex branch
Merge branch 'master' of https://github.com/WiechersV/exo_help_ticket into alex_branch