pequenos tweaks
Merge origin/master