Merge pull request #22 from thaodtp/master

twd
FIX FIX FIX
FIX FIX FIX
Merge pull request #36 from nguyenquanghuy1997/master

156