Updated to handle beta.azubu.tv