Merge pull request #2024 from fdlk/feature/ontology

Feature/ontology