Merge pull request #5 from Edzelopez/AMGA-5

AMGA-5 Multiple commits
AMGA-5 modified function