20141125

20141125 by change zzhang
Merge pull request #2 from zzm305305/branch-test

20141125,dixes #0.0.1