Merge pull request #90 from kjd/fix-licensing

Fix licensing (fixes #87)