Merge pull request #17 from alejandronanez/master

Updates.
Merge pull request #18 from alejandronanez/development

Merge pull request #17 from alejandronanez/master