Fix SocketTimeout errors
Merge pull request #38 from mrbirdman/master

Fix SocketTimeout errors