merge feature/ontology to the master