For Eric and TianYi
Merge remote-tracking branch 'andrew/master' into andrew-alg