fixes nigthhawk454/tv_web#9.
fixes nighthawk454/tv_web#3.
Merge branch 'develop'

* develop:
  fixes nighthawk454/tv_web#3.
  fixes nigthhawk454/tv_web#9.