Merge pull request #1 from jesusmacedo/development

First stage.