Updated two files to master