First Commit
Merge https://github.com/SabinManiac/set-top-box