Update source fix bug #498,499
Merge pull request #39 from maixuanthanh-luvina/master

Update source fix bug #498,499