Merge pull request #10 from yasselavila/develop

Changes for version 0.2