Merge pull request #2 from MediaBrowser/master

Master
Merge pull request #4 from MediaBrowser/gh-pages

Merge pull request #2 from MediaBrowser/master