Merge pull request #20 from yasselavila/develop

Changes for version 0.1