Merge pull request #108 from murtaugh/master

add kimchi