Merge pull request #11 from oisy/zhuhai

Zhuhai
modified
Merge branch 'zhuhai' of https://github.com/healerkx/scada into zhuhai