Some improves
Merge branch 'master' into pepe