Merge pull request #6 from sinri/master

07052318 Recommit