fixes
Merge pull request #1 from X-ROM/kitkat

Merge pull request #1 from aways/kitkat
Merge pull request #2 from aways/kitkat

Kitkat