sync from cnpm and taobao npm
Merge pull request #32 from cnpm/sync-from-cnpm

sync from cnpm and taobao npm