beeter Thomas-Krenn detection
Merge pull request #841 from andrzej-jankowski/develop

Better Thomas-Krenn detection