Make branches ready for merge

[SeBecker]

• Please ensure that the code is clean and readable
• Merge sebecker in benediktkauf
• Ensure that everything is working as it is supposed to be
• Check the Code coverage
• Create a Pull request in the develop branch

[peisenha]

This is done, thank you for your work @benediktkauf @SeBecker