Merge pull request #2 from carbon-yuga/cm-10.1

Push @Krabappels2548 additional changes
Revert: fix compiling on Mac with non-GZIP kernel compressions
Merge pull request #2 from jeroenqui/cm-10.1

Fix compiling issue