small refactoring and fix #348
Merge branch 'develop' into develop.ontohub.org