Added max-idle-time option