Merge master and connector

No change to David's code