Connectors update
Merge pull request #193 from codam/develop

Connectors update