Merge pull request #1 from yasselavila/develop

Initial changes