first commit ammended
3rd
Merge branch 'master' of https://github.com/Adesso/ADAB