timeout work
Merge remote-tracking branch 'upstream/master'
config file command line option
validate streams