PFZ-555: New commit
commit 2
Merge pull request #1 from gmachado/PFZ-555-TASK

PFZ-555: New commit
Merge pull request #2 from gmachado/PFZ-123

Pfz 123 - Story