Merge pull request #1656 from rzhxeo/xhamster