To be reviewed
Merge pull request #1 from mundophil/feature1

To be reviewed