Sprint-5 Integration Fix
Merge pull request #351 from javierluraschi/Sprint5IntegrationFix

Sprint-5 Integration Fix