Added BSD 2-clause license
Merged with upstream