Merge pull request #7 from yasselavila/develop

Latest changes