first commit of toki
Merge https://github.com/brotherb/Toki