Merge pull request #13 from yasselavila/develop

Changes for version 0.2