Merge pull request #1 from mick90207/LKM

Lkm
Merge branch 'master' into LKM