ryanwarsaw Merge pull request #34 from ryanwarsaw/content-fixes