Allow default timeout to be overwritten.
Added comments and incremented version number.