last commit before refactoring
Merge branch 'dev' of github.com:HendrikF/ConnX into dev