More program options
Merge branch 'master' of https://github.com/mgbarsky/streamcount