Moved some things upstream
Merge pull request #3 from atomicspaceindian/kitkat

Moved some things upstream:: Thanks vedant!