code review
Merge pull request #2 from budomuya/code-review

code review