A little bit of fun
Merge pull request #2217 from gittip/sushi

A little bit of fun