fixed some but wtill returning null
Merge branch 'master' of https://github.com/mks65-dw/tunez