Merge pull request #26 from computerquip/upstream-merged

Add copyright and name to files it applies to.