Merge pull request #1 from admpub/patch-1

合并