Merged henryzhao81:master branch