initial commit
some new changes
Merge https://github.com/patriotyk/webtv