Merge pull request #12 from schoolofma/master

pull
Merge pull request #13 from schoolofma/content_

Merge pull request #12 from schoolofma/master