Merge pull request #2464 from rzhxeo/xhamster