Picking up mattn's patch
Renaming as we'll land on 772657