Merge pull request #16 from yasselavila/develop

Latest changes for version 0.1