Merge pull request #20 from thaodtp/master

6315
Merge pull request #34 from nguyenquanghuy1997/master

35135