fix3
fix4
Merge pull request #16 from luchaoqun/master

12-06
boom