Merge pull request #1 from Evisceration/android-4.4

Merge