option -w added
option -t removed
Merge branch 'master' of https://github.com/jackred/mqstream