Updated copyright
Merge branch 'master' into promise
Matchign copyright with other sources.