Merge pull request #15 from yasselavila/develop

Latest changes for version 0.1