fixes nighthawk454/tv_web#3
fixes nighthawk454/tv_web#10
Merge branch 'develop'

* develop:
  fixes nighthawk454/tv_web#10
  fixes nighthawk454/tv_web#3