Merge pull request #2 from zhhuta/dev

Dev
Merge pull request #4 from zhhuta/dev

Dev
Merge commit '008c02fa2d97770443988c409e364c86b4a78fca' into dev