Merged, modified and compiled Dailymotion pull request #446 by @Steap