Rough draft
Merge branch 'master' of https://github.com/tzjin/koi