Partial fix for Kernel 5
sortdone
Merge pull request #5 from twwong/FixKernel5

Fix kernel5