fixing youtube
merging with master