testing 1，2，4
Merge pull request #13 from Btotals/master

testing 1，2，4