initialziji
Merge https://github.com/joh04642/ziji