Merge pull request #1 from dgw/master

Fix for canhazip.com changes
Merge upstream 'master' branch from eitak-ssim