Fix bug #438 , #439
Merge pull request #65 from nguyenxuanluong-luvina/master

Fix bug #438 , #439