Merge pull request #7 from schoolofma/content_

Merge pull request #6 from schoolofma/master