timeout option added + some fix