first commit
Merge https://github.com/intelliliu/nikita