Chrism7

@nils-wisiol , please review my last commit within this pull request. Btw: Do you have any idea about how to solve these 3 remaining linter-errors?