[WUS001] [RQ9] [RQ11] [RQ12]
[AUS002] [RQ3]
Merge pull request #11 from Gonzalo89/WUS001RQ9

Wus001 rq9