Fixes #86.
Merge pull request #87 from jbreitbart/master

Youtube fix