New timeout param

Added timeout param and set default to 30 seconds