to keep in sync
Merge pull request #6 from DeFlanko/DeFlanko_CONF_Directv

Merge