Merge pull request #14 from sinri/master

07122102 bug fix
1.0.26
Merge pull request #12 from Yonsm/master

07122204 From Yonsm's