Merge pull request #460 from LoungeKatt/master

Get filename when info disabled, Regex to avoid invalids
Remove some test changes, Use drawable swap function