Merge pull request #2 from yasselavila/develop

Latest changes