[Issue #14] Fixing connection issues