Another attempt at fixing the connection issues.
Merge branch 'master' of https://github.com/TheLoons/SportIM-service