Merge pull request #14 from yasselavila/develop

Changes for version 0.2