0.23 R5

Need to test
Merge pull request #47 from atomicspaceindian/kitkat

0.23 R5