Merge pull request #8 from yasselavila/develop

Latest changes