Updated connection handling
Merge branch 'master' of https://github.com/FlyingPie/Storm