Make timeout configurable
Merge pull request #176 from cedrics/configurable_timeout

Make timeout configurable