BSD license
Merge branch 'master' into 1.0.0, add license