fixes
some change
Merge branch 'master' into develop
some corrections, new style
conf