Merge pull request #1301 from rzhxeo/xhamster