update other files to keep up to date with master branch