#15 reworking video converting
Merge remote-tracking branch 'origin/master'