Merge pull request #39 from dennishendriksen/master

Additional fix for #28 Timeout waiting for connection from pool