few improvements
Merge branch 'dev'