Merge pull request #1 from ItachiSan/cm-10.1

Merging jenad updates
Just some thoughts...

Change-Id: I231d679912b0795ef52265c20eee06a7de18007b