small tweaks
Merge pull request #1 from pablote/feature/tweaks

Small tweaks