Merge pull request #1 from GiggleKatDevs/master

Master
Merge pull request #2 from GiggleKatDevs/kitkat

Merge pull request #1 from GiggleKatDevs/master