Updated files
Merge pull request #2 from huyvin/branchvincent

Updated files