Merge branch 'release/v0.2.1'
Fixed README Timeout func explanation
Merge branch 'master' into develop