Merge branch 'hotfix/rename_to_delphos'
minor adjusts
Merge branch 'master' into develop