Merge pull request #310 from hulkholden/license