baozhi Merge pull request #18 from vision-ken/master