[AUS003] [RQ2]
Merge pull request #35 from Gonzalo89/AUS003RQ2

[AUS003] [RQ2]