Merge pull request #384 from fahadhatib/develop

Develop
Make the findLogoFile() function faster, more efficient, and more readable
Merge pull request #385 from timschofield/develop

Make the findLogoFile() function faster, more efficient, and more readab...