review & fix issue
Merge pull request #575 from jialinsun/master

review & fix issue