readded support for connection strings
Merge branch 'connection_strings'