Add version to logs
Add a timeout to avoid a possible timing bug.
Bump version