First commit
Merge https://github.com/tihonav/streamconverter