Changed HTTP status returned when timeout occurs to 504.
Merge pull request #3 from dvazquez1027/master

Changed HTTP status returned when timeout occurs to 504.