Merge pull request #1 from buschagne/dev

Dev
Merge pull request #2 from buschagne/dev

entities