Added support for content
Merge branch 'master' into devel