Merge pull request #3 from Zombi-X/testing

merge into kk4.4
Merge pull request #2 from Zombi-X/kk4.4

merge into testing