Merge pull request #16 from alfredzh/dev

Dev
accept pull request from alfredzh
accept pull request from alfredzh