Merge pull request #195 from yilei/push_up_to_461698919

Push up to 461698919