bugfix + cleanup in consumer code
Merge branch 'master' of https://github.com/alexm92/video-converter

Merged clean-up in consumer code.