Merge pull request #35 from yacon/videoplayer

Videoplayer