Updated namecleaner
Merge pull request #37 from DariusIII/dev

Updated namecleaner