Merge pull request #1 from tailormoon/master

update
Merge pull request #2 from tailormoon/kk-0

Merge pull request #1 from tailormoon/master