Fixed Issue #68, added some better matching for youtube code