minor adjustments for multiple connections
Merge pull request #49 from Caerostris/master

minor adjustments for multiple connections