Fixes
Merge pull request #3 from jorge07/dev

Fixes