Switched from deprecated Connection to more updated version (maybe needed by the previous commit)
Merge branch 'master' into improvements
(again) my own improvements