Fixed copyright errors.
Merge branch 'master' into API_Creation