#138 - add default timeout
Merge branch 'feature/timeout-138' into develop