License
Merge pull request #2 from sjmackenzie/master

License