Merge pull request #34 from jcarlosgarcia/master

Validations and minor fixes