Merge pull request #2 from BryanSmithDev/kitkat

Updates from CM branch