Merge pull request #28 from longpham91/master

update
update
Merge pull request #32 from longpham91/Long

Long
Merge pull request #34 from longpham91/master

merge for Rudy