tag 1
Merge pull request #1 from MagicLong/master

tag 1