add timeout to client side
Merge pull request #7 from apcera/aws-related-fixes

add timeout to client side