Fixed errors in the calculation of timeouts.
Bumped version number.
Merge branch 'more-valve-bug-fix' into develop
Merge branch 'develop'