commit middle?
Merge pull request #2 from waichan/new-fix

commit middle?