Merge pull request #577 from xxzuo/feature-574