Merge pull request #82 from phuonghuynh/master

Update changes
Merge commit 'f8c7795f7b60b435cc0b10efe6e229a2dd40393e'