Adding a BSD 3 clause License
Merge branch 'master' into version1