Merge pull request #11 from yasselavila/develop

Changes for version 0.2