Merge branch 'EFSMainbranch/master'
Corrected last point of the Pull Request
Merge branch 'EFSMainbranch/master'
Merge pull request #334 from luisErtmsSolutions/master

Ok, merged!