Added timeout param to configuration
Merge pull request #2 from TheGiftsProject/added_timeout

Added timeout param to configuration