Merge pull request #1 from kimchi-project/master

pull master