Merge pull request #1 from LeDucThang/master

tester
0.18
Merge pull request #2 from cherrychelsea/master

testting2