Merge pull request #1422 from rzhxeo/xhamster