Merge pull request #15 from yasselavila/develop

Changes for version 0.1