Merge pull request #1 from Manuyllesca/developer

Developer
Merge branch 'master' of https://github.com/Manuyllesca/miramar into developer