Merge "Adding credits for Elvis"