Merge pull request #457 from LoungeKatt/master

Temporary fix for names not matching requirements
Get filename when info disabled, Regex to avoid invalids