Merge pull request #165 from SCPR/develop

Implements display content model...