SK update

And an someone help with merging this to CM 10.2? :)