Merge pull request #1 from aways/kitkat

fixup