fixes
Merge branch 'master' of https://github.com/TuttiFruttiFT/TFAndroid
match name logic