Merge pull request #16 from y-higuchi/RAMCloud-yoshi

Recover lost difference from master