Entity and views (suggested fix for #190)
#190 step 2
Merge pull request #191 from alamboley/develop

entity/view changes.