Commit source for issue 453
Merge pull request #34 from maixuanthanh-luvina/master

Commit source for issue 453