Merge pull request #2 from dvazquez1027/master

Socket timeout and 2-way SSL fixes
Changed HTTP status returned when timeout occurs to 504.