Merge pull request #458 from TheBlueMatt/copyright