added layer between connector and connection to make testing possible
Merge remote-tracking branch 'origin/master'