Merge pull request #18 from yasselavila/develop

Changes for version 0.2