merge local changes
Merge branch 'master' into develop
rework to make easier to use.
fix