Update some files
Merge pull request #1 from pominx/update-some-files

Update some files