Commit source for issue 531
Merge pull request #107 from maixuanthanh-luvina/master

Commit source for issue 531