Added content wrapper
Fixed lang string
Merge pull request #28 from RyanThompson/3.0/develop

3.0/develop