merge henryzhao81:master into proteus:master