Merge pull request #2 from wenfengwang/master