Feature/container managed connection

Resolves #130