some small changes
Merge pull request #3 from ibarroladt/javier_branch

some small changes