Merge branch 'MyAdditions'