Added BSD 2.0 licence
Updated LICENCE
Merged branch 'develop' into 'master'