first eidton
Merge pull request #2 from jjdblast/master

jinjiandong 2013-3-2 
>pass it