add timeout option
Bump version number
Merge branch 'add-timeout-option'