Merge pull request #6 from sinri/master

07052318 Recommit
Merge pull request #1 from Yonsm/master

Merge pull request #6 from sinri/master