Merge branch 'hotfix/fix-6' into develop
testing
Merge pull request #2 from jalopez11/testing

Merge Looks Good