Add Apache 2 license info...
Merge remote-tracking branch 'origin/master'