Merge pull request #3 from core9/master

merge back from master
Merge pull request #4 from core9/develop

Merge pull request #3 from core9/master