edited timeout infos in docs, merges #328