Merge pull request #28 from JonathanStarnes/master

Fixed the connection limit issue with a better solution