commit by ty
Merge branch 'master' of https://github.com/csboyty/NewChannel_Web