reshuffled main class for more clear option parsing
Merge branch 'streaming'
adapted usage instruction for streaming