Updated namecleaner
Merge pull request #36 from DariusIII/dev

Updated namecleaner