Merge pull request #3 from core9/master

merge back from master