fixes #273
Merge branch 'angular' of https://github.com/SchizoDuckie/DuckieTV into angular