Added "timeout" in config
Merge pull request #13 from Laurele/master

Added "timeout" in config