[WUS001] [RQ5]
Merge pull request #6 from Gonzalo89/WUS001RQ5

[WUS001] [RQ5]