address PR feedback
Merge pull request #1112 from guangyang/dev

address PR feedback