Changes made by Minh Nguyen (truyennhanvk08@gmail.com).