AMGA-15 Added support for point #22 from AMGA Emails
Merge pull request #4 from Edzelopez/AMGA-15

AMGA-15 Added support for point #22 from AMGA Emails