update
Merge pull request #17 from longpham91/Long

update
Merge pull request #18 from longpham91/master

update