Merge pull request #2 from lunny/master

更新到最新版
update

Signed-off-by: 商讯在线 <swhbox@foxmail.com>
Merge pull request #26 from admpub/master

update