Fixed connection bug
Fixed indentation and line length issues to match pep8
Merge branch 'master' of dev1:gimme