Ensure DB connection clean up
Merge pull request #105 from pitr-ch/master

Ensure DB connection clean up