Facu - PODVI - Various enhancements
Merge pull request #8 from hseghetti/various-enhanc

Facu - PODVI - Various enhancements