Address CRs
Merge pull request #76 from huangpf/dev

Address CRs