inital commit for rebase

Signed-off-by: rebelos <theofficiallysonyrebel@gmail.com>
Merge pull request #1 from rebelos/kitkat

squashed commits from @rebelos