Merge pull request #1676 from rzhxeo/extremetube