added defaults, increased timeout, update version