brpocock Merge pull request #614 from brpocock/license