Merge pull request #1 from ngnatishen/dev

upload
Merge pull request #2 from ngnatishen/master

Merge pull request #1 from ngnatishen/dev