fixed bug with invalid timeout settings, syncrhonized source with documentation