fix #294
Merge branch 'git' into develop
Merge branch 'develop' into develop.ontohub.org