Some fixes
Merge all found types with the same name & class can not extend himself
Merge pull request #2 from 66Ton99/dev

Dev into master