Merge pull request #545 from xxzuo/feature-543