Merge pull request #1 from kousu/master

Proposal