Merge pull request #30 from JiangJunGG/develop

manual merge maxin changes
Merge branch 'develop' of github.com:sidneeginger/SyAutoH into develop