Proposed some fixes and tweaks
Merge pull request #1 from javiereguiluz/patch-1

Proposed some minor fixes and tweaks