Merge pull request #22 from apache/Havret-Update-Copyright