Typo errors

One 'end' and one 'origin' variable undeclared
Merge branch 'features/youtube-iframe'