Merge pull request #11 from Yonsm/master

07122059 From Yonsm's
Update 07122041

Update 07122041
Merge pull request #14 from sinri/master

07122102 bug fix