Adding entity support.
Merge branch 'master' into develop
Merge pull request #12 from odb/develop

Adding entity support.