various improvements
Merge pull request #2 from HernanRivasAcosta/hernan.improvements

Hernan.improvements