Updated authors. Updated connection code.
Merge branch 'functional'