Video support #41
Enhancement