Merge pull request #48 from nubs/master

Fix youtube class a bit.
Don't make me wait
Merge pull request #49 from guywithnose/master

Don't make me wait