Adding copyright info to license
Merge remote-tracking branch 'upstream/master'