Update readme
Change timeouts policy
Make little refactoring