Merge pull request #8 from manelscout4life/kk-4.4

Bring up to date