More strict checking (#6)
Reduced request timeout to 5 seconds (#6)