some little improvings
Merge branch 'origin/dev'