[WUS004] [RQ4]
Merge pull request #32 from Gonzalo89/WUS004RQ3

[WUS004] [RQ4]