Added support for setting timeouts
Merge branch 'release/0.1.0'