Merge pull request #211 from yilei/push_up_to_501119479

Push up to 501119479