Merge pull request #1 from jadasoft/kitkat

Kitkat
Merge remote-tracking branch 'origin/master' into kitkat
Merge