Feature/stream/non const argv

Fixes #574