Implement #189
Implement a button for #188
Fix a bug with the youtube error parser
Merge branch 'master' into dev