Add configurable timeout
Version bump