Updated namecleaner
Merge pull request #70 from DariusIII/dev

Updated namecleaner