Merge pull request #38 from nguyenquanghuy1997/master

gr