adding nhan's changes
Merge pull request #1 from nhanvtran/master

adding nhan's changes