Fix bug #508
Fix bug #509
Merge pull request #100 from nguyenxuanluong-luvina/master

Fix bug #508