Merge pull request #1 from zhhuta/dev

dev
Merge pull request #3 from zhhuta/master

Merge pull request #1 from zhhuta/dev