Updated two files to master
Merge branch 'ThisLooksFun'