Merge branches yuta and nate