fine tune ZSS-725
Merge pull request #47 from RaymondChao/ZSS-725

fine tune ZSS-725