Connection changes
Merge pull request #14 from andrewgtv/AndrewsBranch

Connection changes