Fix building issues
Merge pull request #3 from luk1337/kitkat2

Fix building issues