bug fixes
Merge branch 'gh-pages'
Trying AppleTV format